summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-06-01 15:05:30 +0200
committerGitHub <noreply@github.com>2023-06-01 15:05:30 +0200
commit988f4860618da55c864a7ddb82360a854ab0ab62 (patch)
tree47c05d73379ec401b50023649050e3a4c5b824c0
parentMerge pull request #10352 from grimkor/add-context-menu-status-bar-settings (diff)
parentrenderer_vulkan: Remove timeline semaphore wait (diff)
downloadyuzu-988f4860618da55c864a7ddb82360a854ab0ab62.tar
yuzu-988f4860618da55c864a7ddb82360a854ab0ab62.tar.gz
yuzu-988f4860618da55c864a7ddb82360a854ab0ab62.tar.bz2
yuzu-988f4860618da55c864a7ddb82360a854ab0ab62.tar.lz
yuzu-988f4860618da55c864a7ddb82360a854ab0ab62.tar.xz
yuzu-988f4860618da55c864a7ddb82360a854ab0ab62.tar.zst
yuzu-988f4860618da55c864a7ddb82360a854ab0ab62.zip
-rw-r--r--src/video_core/renderer_vulkan/vk_master_semaphore.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/video_core/renderer_vulkan/vk_master_semaphore.cpp b/src/video_core/renderer_vulkan/vk_master_semaphore.cpp
index 8b65aeaeb..b128c4f6e 100644
--- a/src/video_core/renderer_vulkan/vk_master_semaphore.cpp
+++ b/src/video_core/renderer_vulkan/vk_master_semaphore.cpp
@@ -128,15 +128,12 @@ VkResult MasterSemaphore::SubmitQueueTimeline(vk::CommandBuffer& cmdbuf,
const std::array signal_values{host_tick, u64(0)};
const std::array signal_semaphores{timeline_semaphore, signal_semaphore};
- const u32 num_wait_semaphores = wait_semaphore ? 2 : 1;
- const std::array wait_values{host_tick - 1, u64(1)};
- const std::array wait_semaphores{timeline_semaphore, wait_semaphore};
-
+ const u32 num_wait_semaphores = wait_semaphore ? 1 : 0;
const VkTimelineSemaphoreSubmitInfo timeline_si{
.sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO,
.pNext = nullptr,
- .waitSemaphoreValueCount = num_wait_semaphores,
- .pWaitSemaphoreValues = wait_values.data(),
+ .waitSemaphoreValueCount = 0,
+ .pWaitSemaphoreValues = nullptr,
.signalSemaphoreValueCount = num_signal_semaphores,
.pSignalSemaphoreValues = signal_values.data(),
};
@@ -144,7 +141,7 @@ VkResult MasterSemaphore::SubmitQueueTimeline(vk::CommandBuffer& cmdbuf,
.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
.pNext = &timeline_si,
.waitSemaphoreCount = num_wait_semaphores,
- .pWaitSemaphores = wait_semaphores.data(),
+ .pWaitSemaphores = &wait_semaphore,
.pWaitDstStageMask = wait_stage_masks.data(),
.commandBufferCount = 1,
.pCommandBuffers = cmdbuf.address(),